Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Sep 2011 18:20:36 +0000 (11:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Sep 2011 18:20:36 +0000 (11:20 -0700)
commit184f5b12dc3b03e67cfd7ae4a03aef96b465c45f
treecc9729a7f48f6165ed217dd33d5d83c9adb2587f
parent7836d6264b4744c9ac9c982d9328677aa94adc62
parent82b5c7acef23d930effe94850c8c927ae0dac0da
Merge from trunk.